From: Dave Love <fx@gnu.org>
Date: Wed, 1 Oct 2003 13:22:53 +0000 (+0000)
Subject: (vc-cvs-parse-entry): Revert last change to allow
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~25337
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9dabc477070a2b7c40a6c5f6aa97e510178ae554;p=emacs.git

(vc-cvs-parse-entry): Revert last change to allow
bootstrap.
---

diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index cdbd225412c..048cb6ccfb4 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -5,7 +5,7 @@
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-cvs.el,v 1.64 2003/09/24 11:55:45 spiegel Exp $
+;; $Id$
 
 ;; This file is part of GNU Emacs.
 
@@ -927,17 +927,18 @@ is non-nil."
     ;; This is intentionally different from the algorithm that CVS uses
     ;; (which is based on textual comparison), because there can be problems
     ;; generating a time string that looks exactly like the one from CVS.
-    (let ((mtime (nth 5 (file-attributes file)))
-          (parsed-time
-           (parse-time-string (concat (match-string 2) " +0000"))))
-      (cond ((and (not (string-match "\\+" (match-string 2)))
-                  (car parsed-time)
-                  (equal mtime (apply 'encode-time parsed-time)))
-             (vc-file-setprop file 'vc-checkout-time mtime)
-             (if set-state (vc-file-setprop file 'vc-state 'up-to-date)))
-            (t
-             (vc-file-setprop file 'vc-checkout-time 0)
-             (if set-state (vc-file-setprop file 'vc-state 'edited))))))))
+    (let ((mtime (nth 5 (file-attributes file))))
+      (require 'parse-time)
+      (let ((parsed-time
+	     (parse-time-string (concat (match-string 2) " +0000"))))
+	(cond ((and (not (string-match "\\+" (match-string 2)))
+		    (car parsed-time)
+		    (equal mtime (apply 'encode-time parsed-time)))
+	       (vc-file-setprop file 'vc-checkout-time mtime)
+	       (if set-state (vc-file-setprop file 'vc-state 'up-to-date)))
+	      (t
+	       (vc-file-setprop file 'vc-checkout-time 0)
+	       (if set-state (vc-file-setprop file 'vc-state 'edited)))))))))
 
 (provide 'vc-cvs)